Merge git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Fri, 26 Jan 2018 12:46:47 +0000 (07:46 -0500)
committerTom Rini <[email protected]>
Fri, 26 Jan 2018 12:46:47 +0000 (07:46 -0500)

Trivial merge